* lisp/simple.el (read-minibuffer): Unbreak it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dd3dbe9d0a8b23b905e8cfcedf126cec4e4f03e..5ac921f794134475cda7256f06860e0526e53441 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-09-10  Glenn Morris  <rgm@gnu.org>
 
+       * simple.el (read-minibuffer): Unbreak it.  (Bug#15318)
+
        * dired-x.el (dired-mark-sexp): Unbreak for systems where ls
        returns "alternate access method" in mode (eg "-rw-r--r--.").
 

diff --git a/lisp/simple.el b/lisp/simple.el
index c5e5b313b7b5ef8bffa8a9d2c13e7da67f5d0749..c8fbf0b6daedbd9fb7232f54f2354947bee52488 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1231,7 +1231,7 @@ is a string to insert in the minibuffer before reading.
 Such arguments are used as in `read-from-minibuffer'.)"
   ;; Used for interactive spec `x'.
   (read-from-minibuffer prompt initial-contents minibuffer-local-map
-                        t minibuffer-history))
+                        t 'minibuffer-history))
 
 (defun eval-minibuffer (prompt &optional initial-contents)
   "Return value of Lisp expression read using the minibuffer.